shell: Drop some unused headers and Gdk variables

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/317

diff --git a/src/main.c b/src/main.c
index 01155777cf6723040f515e75eb166d11f45cced6..24583778341b24ed4a3df9f54c459bec85054347 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -11,8 +11,6 @@
 #include <cogl-pango/cogl-pango.h>
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <girepository.h>

diff --git a/src/shell-recorder.c b/src/shell-recorder.c
index a80a00a23c0e4fccc3ac8f16851b31101e90f1c7..9bf36e6db41d4ea310523d38a5daac77eaf7757f 100644 (file)
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@@ -12,7 +12,6 @@
 #include <gst/gst.h>
 
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
 
 #include <cogl/cogl.h>
 #include <meta/meta-cursor-tracker.h>
@@ -52,8 +51,6 @@ struct _ShellRecorder {
   int stage_width;
   int stage_height;
 
-  GdkScreen *gdk_screen;
-
   int pointer_x;
   int pointer_y;
 
@@ -210,8 +207,6 @@ shell_recorder_init (ShellRecorder *recorder)
 
   shell_recorder_src_register ();
 
-  recorder->gdk_screen = gdk_screen_get_default ();
-
   recorder->memory_target = get_memory_target();
 
   recorder->a11y_settings = g_settings_new (A11Y_APPS_SCHEMA);

diff --git a/src/shell-util.c b/src/shell-util.c
index ed659307814a2650b829c787e130d93c0147e346..95d9f8e142a158061f55b68b4b70310a180a8140 100644 (file)
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -19,7 +19,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkx.h>
 #include <meta/meta-shaped-texture.h>
 
 #include <locale.h>

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index f51bea370b53dcf4576b2445a350ef01e47e5eed..a0ba88450db67c285302250b788798f92cebe13f 100644 (file)
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -5,10 +5,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
 #include <meta/display.h>
 #include <meta/group.h>
 #include <meta/util.h>